bitkeeper revision 1.1159.258.153 (42926ca7c8Vr3ajMe46BA7Li6zagcw)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 23 May 2005 23:52:07 +0000 (23:52 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 23 May 2005 23:52:07 +0000 (23:52 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk


Trivial merge